From: Benjamin Otte <otte@redhat.com>
Date: Mon, 13 Jun 2022 02:54:19 +0000 (+0200)
Subject: inscription: Multiparagraph text is always multiline
X-Git-Tag: archive/raspbian/4.8.3+ds-2+rpi1~3^2~81^2^2~126^2~1
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=0a4c08a7be1992845a41c74341756924bf5366d3;p=gtk4.git

inscription: Multiparagraph text is always multiline

Wrap this text and clip towards the bottom, no matter how high the
inscription is.
---

diff --git a/gtk/gtkinscription.c b/gtk/gtkinscription.c
index a06b78b30b..f44937fa69 100644
--- a/gtk/gtkinscription.c
+++ b/gtk/gtkinscription.c
@@ -476,7 +476,17 @@ gtk_inscription_allocate (GtkWidget *widget,
             PangoRectangle rect;
             pango_layout_iter_get_line_extents (iter, NULL, &rect);
             if (rect.y + rect.height > height * PANGO_SCALE)
-              pango_layout_set_width (self->layout, -1);
+              {
+                while (!pango_layout_line_is_paragraph_start (pango_layout_iter_get_line_readonly (iter)))
+                  {
+                    if (!pango_layout_iter_next_line (iter))
+                      break;
+                  }
+                if (!pango_layout_line_is_paragraph_start (pango_layout_iter_get_line_readonly (iter)))
+                  {
+                    pango_layout_set_width (self->layout, -1);
+                  }
+              }
           }
       }
       break;